(header-line): Use `:box nil' for color/gs displays too.

diff --git a/lisp/faces.el b/lisp/faces.el
index a8c9eee55173e742091f01830bcba60a6e31a479..ee65edd3f3bdd0f868b000a4c68371d96212328a 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1601,29 +1601,29 @@ created."
      ;; highlighting; this may be too confusing in general, although it
      ;; happens to look good with the only current use of header-lines,
      ;; the info browser. XXX
-     (:underline t))
+     :underline t)
     (((class color grayscale) (background light))
-     (:inherit mode-line
-      :background "grey90" :foreground "grey20"
-      :box (:line-width 1 :style released-button)))
+     :inherit mode-line
+     :background "grey90" :foreground "grey20"
+     :box nil)
     (((class color grayscale) (background dark))
-     (:inherit mode-line
-      :background "grey20" :foreground "grey90"
-      :box (:line-width 1 :style released-button)))
+     :inherit mode-line
+     :background "grey20" :foreground "grey90"
+     :box nil)
     (((class mono) (background light))
-     (:inherit mode-line
-      :background "white" :foreground "black"
-      :inverse-video nil
-      :box nil
-      :underline t))
+     :inherit mode-line
+     :background "white" :foreground "black"
+     :inverse-video nil
+     :box nil
+     :underline t)
     (((class mono) (background dark))
-     (:inherit mode-line
-      :background "black" :foreground "white"
-      :inverse-video nil
-      :box nil
-      :underline t))
+     :inherit mode-line
+     :background "black" :foreground "white"
+     :inverse-video nil
+     :box nil
+     :underline t)
     (t
-     (:inverse-video t)))
+     :inverse-video t))
   "Basic header-line face."
   :version "21.1"
   :group 'basic-faces)